From: Benjamin Otte <otte@redhat.com>
Date: Wed, 2 Dec 2015 03:36:31 +0000 (+0100)
Subject: Chain up in state_flags_changed
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~4436
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=3513e5e87b4cd4bd7136881d499bfb91b869cf84;p=gtk%2B3.0.git

Chain up in state_flags_changed

When introducing handlers for state_flags_changed in the node
transitions, chaining up was forgotten.
---

diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index edcc60fe86..5e36d083d5 100644
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -616,6 +616,8 @@ swatch_state_flags_changed (GtkWidget     *widget,
   GtkColorSwatch *swatch = GTK_COLOR_SWATCH (widget);
 
   gtk_css_node_set_state (swatch->priv->overlay_node, gtk_widget_get_state_flags (widget));
+
+  GTK_WIDGET_CLASS (gtk_color_swatch_parent_class)->state_flags_changed (widget, previous_state);
 }
 
 /* GObject implementation {{{1 */
diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index a69ba905f4..aac300d911 100644
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -788,22 +788,6 @@ _gtk_file_system_volume_get_symbolic_icon (GtkFileSystemVolume *volume)
     return NULL;
 }
 
-cairo_surface_t *
-_gtk_file_system_volume_render_symbolic_icon (GtkFileSystemVolume  *volume,
-				              GtkWidget            *widget,
-				              gint                  icon_size,
-				              GError              **error)
-{
-  GIcon *icon;
-  cairo_surface_t *surface;
-
-  icon = _gtk_file_system_volume_get_symbolic_icon (volume);
-  surface = get_surface_from_gicon (icon, widget, icon_size, error);
-  g_object_unref (icon);
-
-  return surface;
-}
-
 GtkFileSystemVolume *
 _gtk_file_system_volume_ref (GtkFileSystemVolume *volume)
 {
@@ -894,14 +878,6 @@ _gtk_file_info_render_icon (GFileInfo *info,
   return _gtk_file_info_render_icon_internal (info, widget, icon_size, FALSE);
 }
 
-cairo_surface_t *
-_gtk_file_info_render_symbolic_icon (GFileInfo *info,
-			             GtkWidget *widget,
-			             gint       icon_size)
-{
-  return _gtk_file_info_render_icon_internal (info, widget, icon_size, TRUE);
-}
-
 gboolean
 _gtk_file_info_consider_as_directory (GFileInfo *info)
 {
diff --git a/gtk/gtkfilesystem.h b/gtk/gtkfilesystem.h
index be198850a2..a2b144cd93 100644
--- a/gtk/gtkfilesystem.h
+++ b/gtk/gtkfilesystem.h
@@ -98,10 +98,6 @@ cairo_surface_t *     _gtk_file_system_volume_render_icon      (GtkFileSystemVol
 							        GtkWidget            *widget,
 							        gint                  icon_size,
 							        GError              **error);
-cairo_surface_t *     _gtk_file_system_volume_render_symbolic_icon (GtkFileSystemVolume  *volume,
-							            GtkWidget            *widget,
-							            gint                  icon_size,
-							            GError              **error);
 
 GtkFileSystemVolume  *_gtk_file_system_volume_ref              (GtkFileSystemVolume *volume);
 void                  _gtk_file_system_volume_unref            (GtkFileSystemVolume *volume);
@@ -110,9 +106,6 @@ void                  _gtk_file_system_volume_unref            (GtkFileSystemVol
 cairo_surface_t *     _gtk_file_info_render_icon (GFileInfo *info,
 						  GtkWidget *widget,
 						  gint       icon_size);
-cairo_surface_t *     _gtk_file_info_render_symbolic_icon (GFileInfo *info,
-						           GtkWidget *widget,
-						           gint       icon_size);
 
 gboolean	_gtk_file_info_consider_as_directory (GFileInfo *info);
 
diff --git a/gtk/gtklevelbar.c b/gtk/gtklevelbar.c
index c7c351bf29..a5374edd63 100644
--- a/gtk/gtklevelbar.c
+++ b/gtk/gtklevelbar.c
@@ -666,6 +666,8 @@ gtk_level_bar_state_flags_changed (GtkWidget     *widget,
   gtk_css_node_set_state (priv->trough_node, state);
   for (i = 0; i < priv->n_blocks; i++)
     gtk_css_node_set_state (priv->block_node[i], state);
+
+  GTK_WIDGET_CLASS (gtk_level_bar_parent_class)->state_flags_changed (widget, previous_state);
 }
 
 static void
diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
index 1c60e4b58e..3958345260 100644
--- a/gtk/gtkmodelbutton.c
+++ b/gtk/gtkmodelbutton.c
@@ -239,6 +239,8 @@ gtk_model_button_state_flags_changed (GtkWidget     *widget,
                                       GtkStateFlags  previous_flags)
 {
   gtk_model_button_update_state (GTK_MODEL_BUTTON (widget));
+
+  GTK_WIDGET_CLASS (gtk_model_button_parent_class)->state_flags_changed (widget, previous_flags);
 }
 
 static void
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index ccc0a3fd18..f065c10ce4 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -1884,6 +1884,8 @@ gtk_range_state_flags_changed (GtkWidget     *widget,
   update_trough_state (range);
   update_slider_state (range);
   update_steppers_state (range);
+
+  GTK_WIDGET_CLASS (gtk_range_parent_class)->state_flags_changed (widget, previous_state);
 }
 
 static void
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 8b5f60dc69..629e28e6f2 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -1513,6 +1513,8 @@ gtk_spin_button_state_flags_changed (GtkWidget     *widget,
 
   gtk_css_node_set_state (priv->entry_node, gtk_widget_get_state_flags (widget));
   update_node_state (spin);
+
+  GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->state_flags_changed (widget, previous_state);
 }
 
 static gint
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 8c00efe252..e9d0215c51 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -8740,6 +8740,8 @@ gtk_window_state_flags_changed (GtkWidget     *widget,
 
   state = gtk_widget_get_state_flags (widget);
   gtk_css_node_set_state (priv->decoration_node, state);
+
+  GTK_WIDGET_CLASS (gtk_window_parent_class)->state_flags_changed (widget, previous_state);
 }
 
 static void